Auto merge of #3652 - alexcrichton:beta-next, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 6 Feb 2017 01:49:47 +0000 (01:49 +0000)
committerbors <bors@rust-lang.org>
Mon, 6 Feb 2017 01:49:47 +0000 (01:49 +0000)
commit4ca8f6e4b0731e7feffdc0f87c5033f61089712e
treec017b3f3043463aa3743b6a5e655639ebf4c1dd6
parent407edef22e894266eb562618cba5ca9757051946
parent90e128f088cef825e36e83a58b727dddac24eb68
Auto merge of #3652 - alexcrichton:beta-next, r=alexcrichton

Fix beta branch CI

Cherry pick a few commits from master